The Echidna run for this PR failed as the whole repo seems to be out of date with respect to the global local-biblio.js file. I assume that this will be resolved when @pchampin's PR #256 is merged.

Rebasing should mean this PR only has changes for spec/index.

Yes, indeed.

Perhaps I made a mistake in the way I rebased (I am not doing that so often). In my local version of the feature branch for this PR, I did:

git rebase main

After that, I did:

git pull

But the latter (pull) didn't work; git said I first have to do one of the following three things

1. git config pull.rebase false
2. git config pull.rebase true
3. git config pull.ff only

I did the second (because I thought that this is what I have to do in order to rebase). After that, git pull worked, and finally I did git push

The branch now has rewritten the 2 commits from main (different hashes) on top of your changes. that wil show up when merged to main (probbaly "skipped previously applied commit").

After git rebase, it should have been git push -fwhich replaces the remote branch with the updated local state.

Solution:

git rebase main # again.
# Ignore the  "skipped" messages
git push -f

and now the branch has the commit from main (same hash) and will be rebase-and-merge compatible with main.

As I've got that locally, I'll "push -f" the PR branch. (after - now 1 file changed).

After git rebase, it should have been git push -f which [...]

Thanks!